Merge branch 'master' of git.nanl.de:openwrt/telephony
authorMazi Lo <[email protected]>
Tue, 29 Oct 2013 04:32:36 +0000 (00:32 -0400)
committerMazi Lo <[email protected]>
Tue, 29 Oct 2013 04:32:36 +0000 (00:32 -0400)

Trivial merge